Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Sun, 5 Mar 2023 11:59:06 +0000 (19:59 +0800)

committer Po Lu <luangruo@yahoo.com>

Sun, 5 Mar 2023 11:59:06 +0000 (19:59 +0800)
author Po Lu <luangruo@yahoo.com>
Sun, 5 Mar 2023 11:59:06 +0000 (19:59 +0800)
committer Po Lu <luangruo@yahoo.com>
Sun, 5 Mar 2023 11:59:06 +0000 (19:59 +0800)
diff --cc lisp/files.el
Simple merge
diff --cc lisp/subr.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sun, 5 Mar 2023 11:59:06 +0000 (19:59 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sun, 5 Mar 2023 11:59:06 +0000 (19:59 +0800)
		1	2
lisp/files.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history